Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate media boards into the rockchip64 family #6834

Merged
merged 5 commits into from
Jun 30, 2024
Merged

Integrate media boards into the rockchip64 family #6834

merged 5 commits into from
Jun 30, 2024

Conversation

ColorfulRhino
Copy link
Collaborator

@ColorfulRhino ColorfulRhino commented Jun 29, 2024 •
edited
Loading

Description

The media board family was long abandoned and most boards that formerly were using this board family already switched to rockchip64 or rk3588. @rpardini recently mentioned being in favor of getting rid of this kernel: #6717 (comment)

Integrate the last remaining boards into rockchip64 and remove the media board family, including its kernel.

GitHub issue reference: #6821
Jira reference number AR-2392

How Has This Been Tested?

  • ./compile.sh uboot BOARD=quartz64a BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie
  • ./compile.sh uboot BOARD=quartz64b BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie
  • ./compile.sh uboot BOARD=station-m1 BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie
  • ./compile.sh uboot BOARD=station-p2 BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie
  • ./compile.sh kernel BOARD=station-p2 BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie
  • ./compile.sh uboot BOARD=firefly-itx-3588j BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no EXPERT=yes KERNEL_CONFIGURE=no RELEASE=trixie

@SeeleVolleri You can test the Firefly if you like. Your board was using the abandoned U-Boot from the media family. But it should work same as before :)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@github-actions github-actions bot added Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Jun 29, 2024
@ColorfulRhino ColorfulRhino mentioned this pull request Jun 29, 2024
Closed
13 tasks
@ColorfulRhino @rpardini
station-m1: Integrate into rockchip64 board family
2538dfb 
The `media` board family is being deprecated.
@ColorfulRhino @rpardini
station-p1: Integrate into rockchip64 board family
94083de 
The `media` board family is being deprecated.
@ColorfulRhino @rpardini
quartz64: Integrate into rockchip64 board family
e5f1d99 
The `media` board family is being deprecated.
@ColorfulRhino @rpardini
Remove unused board family media
fdc752c 
All remaining `media` boards have been integrated into the `rockchip64` family.

- Remove the family config
- Remove all kernel patch folders
- Remove all U-Boot patch folders
- Remove all kernel configs
@ColorfulRhino @rpardini
firefly-itx: Don't use abandoned media U-Boot
bb5303c 
The board config file was likely copy-pasted from a former `media` board and thus includes some stuff that is not needed, like the abandoned U-Boot repo which is basically an old fork from Raxda's vendor U-Boot.

- Switch to default rk3588 vendor U-Boot (using a generic rk3588 defconfig)
- Cleanup board config file
@rpardini rpardini merged commit 227c756 into armbian:main Jun 30, 2024
4 of 5 checks passed
@SeeleVolleri
Copy link
Contributor

SeeleVolleri commented Jun 30, 2024 •
edited
Loading

Hmm, that's weird. I don't know why, but firefly-itx-3588j won't boot.

DDR Version V1.08 20220617
LPDDR4X, 2112MHz
channel[0] BW=16 Col=10 Bk=8 CS0 Row=17 CS=1 Die BW=16 Size=2048MB
channel[1] BW=16 Col=10 Bk=8 CS0 Row=17 CS=1 Die BW=16 Size=2048MB
channel[2] BW=16 Col=10 Bk=8 CS0 Row=17 CS=1 Die BW=16 Size=2048MB
channel[3] BW=16 Col=10 Bk=8 CS0 Row=17 CS=1 Die BW=16 Size=2048MB
Manufacturer ID:0xff 
CH0 RX Vref:27.7%, TX Vref:21.8%,0.0%
CH1 RX Vref:26.7%, TX Vref:21.8%,0.0%
CH2 RX Vref:27.7%, TX Vref:21.8%,0.0%
CH3 RX Vref:28.7%, TX Vref:20.8%,0.0%
change to F1: 528MHz
change to F2: 1068MHz
change to F3: 1560MHz
change to F0: 2112MHz
out
U-Boot SPL board init
U-Boot SPL 2017.09-armbian (Jun 19 2024 - 13:59:41)
Trying to boot from MMC2
spl: partition error
Trying fit image at 0x4000 sector
## Verified-boot: 0
## Checking atf-1 0x00040000 ... sha256(a7d1d8d191...) + OK
## Checking uboot 0x00200000 ... sha256(51ab307e25...) + OK
## Checking fdt 0x0033faf0 ... sha256(912cda2231...) + OK
## Checking atf-2 0xff100000 ... sha256(4b2065349b...) + OK
## Checking atf-3 0x000f0000 ... sha256(aa71013e72...) + OK
Jumping to U-Boot(0x00200000) via ARM Trusted Firmware(0x00040000)
Total: 228.919/468.165 ms

INFO:    Preloader serial: 2
NOTICE:  BL31: v2.3():v2.3-682-g4ca8a8422:derrick.huang, fwver: v1.45
NOTICE:  BL31: Built : 10:11:21, Dec 27 2023
INFO:    spec: 0x1
INFO:    code: 0x88
INFO:    ext 32k is not valid
INFO:    ddr: stride-en 4CH
INFO:    GICv3 without legacy support detected.
INFO:    ARM GICv3 driver initialized in EL3
INFO:    valid_cpu_msk=0xff bcore0_rst = 0x0, bcore1_rst = 0x0
INFO:    l3 cache partition cfg-0
INFO:    system boots from cpu-hwid-0
INFO:    disable memory repair
INFO:    idle_st=0x21fff, pd_st=0x11fff9, repair_st=0xfff70001
ERROR:   dfs get fsp_params[0] error, 0xfead0001 != 0xfead0004
ERROR:   dfs get fsp_params[1] error, 0xa54 != 0xfead0004
ERROR:   dfs get fsp_params[2] error, 0xbc != 0xfead0004
ERROR:   dfs get fsp_params[3] error, 0x3f0033 != 0xfead0004
ERROR:   loader&trust unmatch!!! Please update loader if need enable dmc
ERROR:   current trust bl31 need match with loader ddr bin V1.13 or newer
ERROR:   current loader need match with trust bl31 V1.07-V1.37
INFO:    BL31: Initialising Exception Handling Framework
INFO:    BL31: Initializing runtime services
WARNING: No OPTEE provided by BL2 boot loader, Booting device without OPTEE initialization. SMC`s destined for OPTEE will return SMC_UNK
ERROR:   Error initializing runtime service opteed_fast
INFO:    BL31: Preparing for EL3 exit to normal world
INFO:    Entry point address = 0x200000
INFO:    SPSR = 0x3c9


U-Boot 2017.09-armbian (Jun 30 2024 - 19:41:44 +0000)

Model: Rockchip RK3588 Evaluation Board
MPIDR: 0x81000000
PreSerial: 2, raw, 0xfeb50000
DRAM:  7.7 GiB
Sysmem: init
Relocation Offset: eda1e000
Relocation fdt: eb9fa7c0 - eb9fecd0
CR: M/C/I
Using default environment

optee check api revision fail: -1.0
optee api revision is too low
### ERROR ### Please RESET the board ###

And sorry for late reply.
I'm trying to fix u-boot issues mentioned in that pr #6747
fixed in #6849

@ColorfulRhino ColorfulRhino mentioned this pull request Jul 1, 2024
Closed
5 tasks
@ColorfulRhino ColorfulRhino deleted the media-kernel-rework branch July 2, 2024 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rpardini rpardini rpardini approved these changes

@igorpecovnik igorpecovnik Awaiting requested review from igorpecovnik igorpecovnik is a code owner

Assignees
No one assigned
Labels
Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ...
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ColorfulRhino @SeeleVolleri @rpardini